Improved variable naming a bit