Fix a few foodcritic warnings