MOD:tidy modules' code