Final layout pep8 corrections