Less lines for the same code
cleaned