Bulk refactor