Made a little refactor