Refactoring - final stept to the deployment