Idle processing refactoring done