some improvements.

Don't remove the `@return void`, pretty much happens for the rest of the PR.