Removed some commented out code
Cleaned up some PEP-8 and indentation errors
Fixed except