formatting tweak (and hack reword to support it)