Foodcritic, rubocop, tailor fixes