Abstracted out the font style and tidied up many things