Minor tweaking and tidying