code/comment clean-up
(#388)