PEP8 CamelCase to _underscore corrections 2