a few comments and cleanup