Updated according to code review feedback.
5 files changed