Various coding style fixes
We do not use tabs