- some minor tweaks based on review feedback