addressed maintainer comments