Address Hugh's review comments