pep8, pep256 and some rewriting