Improved variable naming
Code readabilty improvements continued