Changes due to suggestions from @kcooney.