Cleaning up some code, untested

[TheApeMachine]

Saw your defcon talk a few days ago, liked it a lot. While having a look through the code, I had some ideas about refactoring it a little. Unfortunately I am not able to test this at the moment, but it should work transparently to the current version.

[DigidyDOG]

I like the functions you added it really compacts and cleans up that code quiet nicely.