Further cleanup of customization and doc for it.