Use prototye for CLASS_ID
Minor fixes
Refactorings
Refactorings
Refactorings