Improvement a code analysis 3