[MOD] clean the code