Rubocop Cleanup

Fixing all the things...
rubocop says the opposite ...