Tweaks to file per @jtimberman's comments