Small modification of operator to clean up the toString method