Issue 18: Refactor Util class