design : a couple of tweaks