toString cleanup