Some cleanup in the code.
++ doxygen comments.
Cleanup.