Strings cleanup and reorganization