Cleaned and commented

Cleaned and commented