Specs tidy up

I was just tidying a couple of things before getting to the point of this branch. Then a couple turned into a few and I figured it would be better to merge this stuff in on its own as opposed to having a massive pull request.

I'll be curious to see what Hound has to say about this PR.