Tidy up checking for draft status