Obey hound

In order to make the style consistent throughout each touched code file,
I also changed some lines that hound would complain about that were not
changed in this feature-branch.