Minor changes, such as making some class names more specific and adding annotations.