[Front] Refactoring