Small design improvements