Refactoring and Batch actions