Just a token update with some comment cleanup.