Break up namespace, using inside namespace
Add some comments