Address review comment 12.1, 13.1, 13.2