toString + small improve