more comments and a little clean up