Refactor package "util"