Refactoring Front End