eliminated repetition between unnecessary classes