Some comments and tidying up