Made some more small refactors to reduce private variables where they are not needed as well as renaming variables and methods to something descriptive.