addressing more pr comments