cleanup, slight revisions