comments and small refactor to initModules