VID-810 Changes for code review, plus some style/doc updates