refactoring the methods names and class