Making Script Dragon a lot cleaner in preparation for SkyNet