Small refactoring of behaviorals