Addressed issues from code review.