Remove return from void-returning function.
Add some comments to new functions.
Remove obsolete comments.