Minor comments, clean-up