Behavior refactoring