DS-1005 additional cleanup from review comments