Tidying the structure up