toString() cleanup