[bulk_actions] some cleanup & refactoring