remove trailing whitespace
add standard for dealing with callbacks
Merge pull request #1768 from danielb2/callback.returns

Style: callback to have explicit returns