improved utility class packaging