Tidying up the edges