Cleaned

Cleaned and added comments