More consistent formatting of functions