Added Chocolate stuff and format all classes.