IDE-770: Greg review comments incorporated

Hi Greg,

Here is the updated pull with your comments incorporated.