Make order of functions and section headers more friendly