Various refactorings

Useless assignment to variable - `draft`.