CB-2680: correct spacing and indentation