Improved commenting around different classes