Cleanup the Kitchen

Note, this is going to fail Rubocop warnings, but they were already failing before I fixed this up and the changes are outside of the scope of this PR.