Niranjan's code review

Looks good!