Add clans to default imports.
Small code consistency improvements
Updated doc