Minor formatting fix and comments
Fix commented debug code
Add missing multiply_diversity assignment in composite_score::operator=
Remove dumb return