Tidying up a bit!