Updated model class formatting.