Pep8 and read the docs refactoring