Revert "Improve a few things"
Merge pull request #2 from j-selby/revert-1-master

Revert "Improve a few things"