Refact untils.go