refactor suite match method
refactor suite match method