Front end refactoring