a few more comments and cleanup
a few more comments and cleanup