DRYing up the polymorphic associations
Fixing a couple typos