cleaned up Util class