Code review, add some comments, undo previous commit (it makes the source ugly).