Cleaned up the script, rebuilt workflow