Removing font and tidying up