PEP 8 + correcting imports for Python 3