Make spacing around function names more consistent