some more comments and clean up