Fix comments.
PUBDEV-2: Further cleanup. Encapsulate members where possible, make private.