Refactor fill.go