Refactoring of action scheduling