changes from review(made matcher private final)