Finished Potential Shuffling and Code Reorganization