more foodcritic fixes