Hopefully final formatting of function headers?