PEP8 fixes
Simplify setup
Version bump