continued refactoring of pending actions