some visual smartening and tidying up