Incorporate @lukehefson's design improvements