Address review comment 2.47-48, 2.50, 2.53, 3.22-28