Cleaning up some variable and method names across the application. Trying to make the code easier to understand.