Rename some class variables to local variables, and gave meaningful variable name