PEP8 CamelCase to _underscore corrections