Revert "Revert spaces"

This reverts commit 696db92e6fce3441fdd3fe12e40c55c01df897b2.
Revert "Fix"

This reverts commit ddf32bdceb0f4a7cd6043c9848f3abf6f962370b.