Simplify relationship stuff a hair