Some quick pep-8 clenaup