* Code optimization * Code optimization: modifier optimization, condition simplification, etc. * Fix CI error * Fix CI error