update comments and whitespace issues per code review.