make modle.go in a better shape