Cleanup (#311)
Cleans up craft creation a little (#311)