My IDE is configured with 2 spaces. But the issue is that some existing code has 4 spaces. IIRC, the rule is to be consistent with the style used by the existing file unless we do a complete reformat. 

We can reformat the code that still use 4 spaces in a batch.