First pass through with rubocop
Rubocop tidyup
Merge branch 'feature/rubocop-tidyup' into develop