fixkitchen: move around some code