Removing a part of code introcduce by error during the merge
Adding quotes option for the overload of toString