Refactor the Util class