fixes changes as per code review