cleaning some code after separating the classes