Refactor: token as parser elements