Pep8 fix and be consistent about docstring formating