minor refactor to CommonJsSourceModule