fixed some repetition