Cleaned up the object linking a bit more