Foodcritic and rubocop fixes