Make structure clearer