more writemaths cleanup