Revert "Wraped some functions, removed some spaces"

This reverts commit 1c62f75a04c39b1bc9568a79a7a8eee18cc56542.