do some little refactor