Tidying up the structure