GCAction refactoring