Tidying up some mess