Mostly just tidying up