addressed Vinayak's comments
3 files changed