style and layout tweaks, plus simplification