Fixed comment and minor tidy-up.