Rubocop improvements.