Deploying refactor