Update definitions
Fix header style