Remove the bad smells on code