dox cleanup
(#601)
some code and dox cleanup
(#601)