Cleaned up relationship between objects