minor writer side cleanup