comments and cleanup
more clean up and generalizing... more to do