Cleanups from scapegoat
Merge pull request #553 from rorygraves/scapegoat

Cleanups from scapegoat