First cleanup based on Rubocop results.