Rubocop Cleanup

Fixing all the things...