allman ref and other tweaks