Completed operations refactoring.