Cleaned up some more the module.js