Cleanup + compile script
Modified to use full strings for types