More comments and more cleaning
A bit more clean up
Fix null exception from clean up