PEP 8 Formatting

Started formatting and renaming variables.