tabs->spaces, return values, scope
Revert "tabs->spaces, return values, scope"

This reverts commit 90b2230467a16b41ee9f75d43bf267dc95cfd3e7.
dun goof'd