big refactor for general PEP cleanliness...