STY: Pep-8 and comment cleanup