Cleaned up Crafting request classes
More minor fixes, formatting, added todos, etc.