style & format tweaks