Tidied up typesetting and font styling