Finishing up the tidying