Improve name of function a bit