Changes as per the code review corrections