more code cleaning and renaming
Some name changes along with using implicitly typed local variables in some places for better coding practices