Style cleanup: naming of function