Stylistic changes

Made variable naming consistent with style guidelines across the code. Changed some variable names to be more descriptive of their functions.