* Added code block termination comments and other comments / documentation updates
* Moved all code into class structure