small design improvement