Al refactoring