Clean up code
Fix incorrect behaviour in OneOrMore
Clean up cardinality messages
Fix indentation
Tidy indentation
Cleanup to avoid circular ref
Improve NotConnected exception messages
Clean up