Make spacing around function names more consistent

This patch removes some superfluous spaces around function names and is only a small improvement to the style of the code.