Fixing code after code inspection