Relatively major cleanup, nicely intended with spaces and nice readability-ness
Fixed a few syntax errors and moved some other things to class definition that should be in there.

I strongly recommend taking this version and disregarding the others, and then sort out our permissions. :P