More comments and more cleaning
A bit more clean up