[CF-165/CF-322] Minor indentation fixes