Made little refactor to keep the streak going :D