#1151 Code review updates