Fix foodcritic issues