Wrap some functions v3...

Well, my third attempt to do a pull request :p, this time I fixed the spaces too, hope I did it right this time.