Header edit: shorter
minor changes