[MOD] Code optimization