lose a few lines
tidyup and pep8