Further style cleanup thanks to Rubocop