Refactor/foodcritic