Refactoring of java classes
Refactoring