Code Indentation changed to 2 spaces

As discussed in #662 , have changed code indentation to 2 spaces.

On the way, we saved a 100Kb :-)