PEP8 and comment cleanups