Resolve foodcritic warnings