Style

Please look over this and make sure all of my variable name changes are helping to make the code more readable. I will have one more follow up commit to fix line length, but wanted feedback so that I could add other changes while doing that.