Fix foodcritic

... by changing a lot of things :angel: