optimize: removed use of the module() function 

optimize: removed use of the module() function