fixed reviewer comments