Addressed issues from initial code review.