Improve comments and var naming