refactoring all classes