Small tidying up