Another toString() improvement