more refactoring
refactored relationships