refactor data
build