Improve comments and variable names