minor cleanup/comments