Reformat code, add picture (list of matchers)