ssantos21 Clean the code