PEP8: formatting changes, minor comment fixes