Refactor modules
Fix emitting argument names