Clean up unfinished work, move order cookie key def into class