little refactor for function names