address Vinayak's code review comments
6 files changed