Improve pattern matching function

Later.