Slight refactor on Util classes