Make internal utility class package-private