I've never really understood PEP8 here, but shouldn't these be 4 space indents vs. 8? (And the return tuples below?)