Changes made after code analysis