Cleanup constants
Rewrite matching rule
Move up public method sort
Use 'times' instead of 'while 1<10'