A little clean-up
Model associations