Cleans up code using rubocop conventions