Working production environment and Refactoring