Revert "Fix typo, weird indentation"

This reverts commit 7b1c5f52b0f83515e104f8352c4c1cb0a6424905.
Revert "Fix grammar"

This reverts commit 9363b585ce632837179523df337ee125546854a4.
Merge branch 'master2' into master-si-spill-fixes-v4