Code Cleanup 3
Moved some comments around to make things clearer
Brought all code into line with pep8 standards
Removed debugging code