minor code cleanup and formatting, use proper commviewer names