cleaned namespaces and removed wildcard imports