parser tag refactoring