Tidy up

Very awesome idea (it works on my machine too!) and I've been tidying up some of main program while playing around with it.

Nothing major at the moment, mostly around readability.