cleanup, reorganise, slimmen data file