Use OO approach
This is actually the analyzer
Remove procedural analyzer