Refactor name of function