PEP8'd before starting revisions