PEP8 and log statement cleanup.