Address comments by @keflavich