Formatting updates for CLI/public bootstraps