Fixed header comment and clause syntax