address review feedback
6 files changed