Removed more of old comment style
Converted to PEP 8 method names