Cleaned up root namespace