CommonJS Refactoring