yeah
little refactor