Addressing @elemoine's review comments