Cleaning - pep8 and 2to3