Moved some strings into strings