refactoring pasquetta