address code consolidation request from maintainers