Clean up some foodcritic warnings