Minor updates and tidying