Moved to python3 and followed PEP8