A bit of PEP8 clean up

Happy to add some additional functionality as time permits too.