Just making some comments and tidying up