Address review comment 2.5, 2.21-2.24