cleaning up xml comments and ensuring default strategy is set.