more comments and clean up