address some pr feedback