fixing PR suggestions