Improve comments, variable names