comments, minor cleanup