Slightly cleanup delivery form