Changes for review comments on PR 180