deploy: refactoring