Refactoring of Front-end