Apply pep 8 (second pass)