Some clean-ups and comments