Fix enum namespacing

Fix enum namespacing

Remove code comments
Merge pull request #1 from pzol/master

Fix enum namespacing