Refactoring of the assembly