Make minor tweaks