refactoring
refactoring part 1
Class Refactoring