Make parser's classification logic more clear