rework static analyzer