[MOD] cleaning code