Make pattern match simpler