SolutionWriter tidy up