Refactor Relationships Controller