Cleaned up a bunch of crafting code that I never really liked.