Cleaned up some foodcritic warnings