mass actions refactoring