Implement @alex's code review.