Rubocop Test

I made this pull request for discussion purposes... @alloy can you tell me which changes you like and which not?