Improved some comments and variable names