Basic refactoring in CompleteAction