improve readability
prevent conflicting namespaces
some initializers
prevent conflicting namespaces
few smaller fixes
few smaller fixes
few smaller fixes