Refactoring the code, the classes