cleanup associations.rb a little