Revert "Refactor"

This reverts commit 6af0e1655bd1ac36580be17584a08310310e5155.
Bsort