Refactor tools out of actions