Address @carreau 's review comments