Just tidying up some stuff