Small design improvement