lieve refactoring