some little refactor