Address Nimisha's code review comments