Improve comments, and namings.