Revert "Keep same spacing as Xcode does"

This reverts commit 88ba7fb789fd4b4714defdeb88345801d883731f.
Revert "Make it look like Xcode generated project"

This reverts commit 71fcb49c9b2b4dcfa89b436b9cd759b67d7a7d14.