Removed getModuleName() and simplified run()