Issue 18: Refactor util class