Refactory font end