Fix for Foodcritic

As if I was not annoying enough in the PR queue, here is another one!

We use Foodcritic here in a both a continuous testing setup and in our git pre-commit hooks. That means the every commit I do results in a red mark if I fail at FC compliance...

So here is a bunch of little fixes that makes Foodcritic happy (look at [Foodcritic website](http://acrmp.github.io/foodcritic/) if you don't already know what it is).

To the exception of FC041, all fixes are really, really simple.