comments and clean-ups
(#6)