cleaning up the tabs to spaces

Alain: I am cleaning put the tabs. Would appreciate if you merge to the main line.