more comments and cleanup
cleanup and comments