pvs2c2 finished
refactoring...
end of refactoring (first pass)
Debugging started, end of day 6/4