A couple comments and a little cleanup