Minor code cleanup; Doxygen comments provided