Refactor parse, use parenthesis