CLC-2816 Comply with whitespace standard