Improved variable names.