refactor
Merge pull request #2169 from Pomax/sortcomp

refactor