Cleanups in code formatting (pep8)