Changed comment and code format, re code review.