small refactor on draft_stamp