Refactor - simplify template hash matching

[ppershing]

This refactor tries to simplify template matching code. Instead of copy-paste-like looking code, we now have one definition table and a simple loop which matches the template