Type refactor, var -> TVertex