#71 Small design improvements