Fix foodcritic

Fix up a few basic foodcritic complaints

```
$ foodcritic --epic-fail any .

```
= 0 warnings.