Added comments after first round or code review.