adjust to refactoring in reordering handling and simplify reorders
avoid gaps in order
Merge pull request #91 from jackalope/reordering-logic

adjust to refactoring in reordering handling and simplify reorders