Cleanup header style

Tested and work without flaws.