address comments from maintainers