Stylistic updates to code based on Rubocop
Rename methods based on Rubocop recommendations