Incorporate @seancorfield's suggestions