Some more cleanup related to the last commit (unneeded manual crafting/unneeded closing with ;)