Clean up code for Rubocop