improvements based on code analysis results