code cleanup, less memory usage for DATA