Enhanced the toString()