improve function headers