CB-3022: Fix spacing, convert all tabs to spaces