Fix code style and doc comments
Fix erroneous argument 3 passed to the callback closure