Cleanup and fixes DATA usage