Code reformating to work under pep8