fixing reviewer comments