cleaned and changed