Refactor out utils and hardwire in more decorators