Clean up and PEP8. More to do yet