refactor(Parser): cleanup