Minor clean ups and comments