Changes made while doing code review