Small code review updates for a number of files;