Address dreid's comments
2 files changed