Add some more comments and do a little code clean up
Couple of new comments