Moved around some of the string functions