PEP8, doctoring, and variable name changes