Address review comment 4.5, 4.7, 4.9, 4.14