minor cleanup, comments.