cleaned up the data map