Change font and improve code