PEP8 and comment cleanup