Style fixes

* Specifically adding `return` to callbacks
* fix trailing `;` in callback doc
* remove some unused variables and declarations
* Misc style fixes