Refactoring For production Deployment