Cleanup and docs

Tiny tweaks.