ROW idling mechanism refactoring