Rubocop fixes for 2.0.0
Foodcritic fixes for 2.0.0