pep8 clean-up of the source code