Fix whitespace issues in CBI template