Neaten untidy code - still horrible
Merge pull request #11 from allending/master

Neaten untidy code - still horrible  OTL