#1282 Code review udpates