Cleaned up & top level namespace
Cleaned up