Tidying up some stuff