Addressed Phil's review comments.
2 files changed