trevorld refactor: Implement 'lintr' suggestions