minor cleanup, comments, etc.