Comments and tidying up