Niranjan's code review