Refactoring in Batch lexxer