VE-119 doc comments and code cleanup