some simple cleanup/re-org of code
Add some comments
add some more comments
add some more comments
don't forget the logger
more light cleanup