Simplify Utils a bit