Address review coments.