Pep8 and other minor changes
lalala