Refactoring CEP