remark, code clean up

continuing to clean up remarks and code to prepare for doxygen.