addressing pr comments