[MOD] code cleaning