Remove unnecessary anonymous functions

While at it, fix a few whitespace issues.
Merge pull request #1 from he7d3r/patch-1

Remove unnecessary anonymous functions