Revert "cleanup, whitespace"

This reverts commit dc9e98bed4558bc8189f31bd9cf87afb3bf30929.