Clean up code
Add Keys dictionary
Capitalize class names