Refactor variable names for PEP8 compliance

Pay no attention to the tabs