Implemented changes requested via code review.