con #15496 Peer Review Changes

Code changes made based on peer review. Still need to change tests