Improved variable naming