pep8 reformatting.
New layout.