Cleanup.
Tweaking doxygen comments.