Fix pep8 requirements, add a lot of indentation and commentary