Leger refactoring