better cleanup of the data