Minor clean up of some function parameters