Addresses review comments