Refactored analyse