Fix enum namespacing

Fix enum namespacing

Remove code comments