WIP: fix more foodcritic
Merge branch 'topics/fix_moar_foodcritic'