Assembl : start refactoring