Minor writing structure tweaks