[REF] auto-fix conventions (and manual fixes)

Is this change necessary for the pylint tests? This seems terribly confusing.