improve Data.go