Changed code for code review.