reflected code review comments
6 files changed