Convert to new style class
Rename methods to follow recommendations of PEP-8