Foodcritic, rubocop, tailoer fixes
Merge branch 'foodcritic_fixes'