Moved a licence information into an XXX comment
Removed schema specifics on joining
Some code style cleanup