reformat match class to support reuse of existing functions