Optimized after IDEA inspection