Minor Change: Improved variable names