fix ModuleExecutor + automatic code clean-up (again)