Improve comments and naming