Refactor the parser with parser combinator. Yeah!