Pep8 and doc fixes