[sc-517] Use match and switch terms like Kind, remove complex pat-match expressions

[sc-517] Use match and switch terms like Kind, remove complex pat-match expressions #180