now fix all my pep8 probs!