FE: deployment
Refactoring