minor refactoring
Capitalize class names