+ Removed unreachable code here and there.
    + Refactored some shuffling functions and got rid of the ext structure.
    + More code cleanup.