Make minor tweaks based on mason's comments