removed code repeating