Intervention#match implemented, code refactored