Simplify the utility class