Header now uses proper comments