Convert 4 spaces to 2
Lots of updates