uniform indentation of 2 spaces

Indentation used across files was either 4 spaces or 2 spaces. Converted all the 4 spaces to 2spaces.