Cleaning up consumer code
Re-shuffling