Tidy up
Merge pull request #3 from St4rk/w

Tidy up