Rubocop driven tidy up