New string and some Cleanup