Clean up based on rubocop results