Shuffle functionality around and general cleanup