Started to make pep8 happier. Lots to be done