Frontend refactorings