let's made this code better :)