remove some unnecessary repetition