Minor cleanup from revisions