Cleanup header

Ok, this looks reasonable.