Tidied up some font stuff