[SPLEEF] Refactoring