Incorporate @ahippo's suggestions