This PR applies on top of the foodcritic PR. It includes many stylistic changes to get closer to passing RubuCop and foodcritic tests.