Improvement a code analysis 2