Refactoring required To be completed with E2602
Refactoring required
To be completed with E2602