Pep8 and a few doc strings