PEP8 all the things and better version mgmt