Design: minor tweaks