IDE-770: Gregs review comments implemented