Assembl : start refactoring
Assembl : start refactoring