pep8 compliant, some half/missing comments fixed