Running modernize for 2 and 3 compat
Using six but not passing tests
PEP8 formatting