Implement @alex's code review.
2 files changed