Clean Makescripts a bit