Updates per @metadave's comments