Improve the module pattern