More pep8-ifying -  http://jira.catami.org:8080/browse/CAT-472