Docs, cleanup and pep8