Addressed some of the issues suggested in PR 1882