much needed cleanup, fixed foodcritic warnings