change modules to static methods