Some cosmetics changes for selection algorithm, for demonstration