a few tweaks for style, etc.