PEP8 fixes and use new-style classes