Clean up of Module.runMain, module.js and some comments