Cleaning
Added some commenting.