Style improvement
Add draft warning