Util class light refactor - needs much more work