improved structure and description