Made chages as per code review feedback