Formatter still not quite right