Merge pull request #16727 from rhvgoyal/code-cleanup

devmapper: Little code cleanup and code reorganization