Cleanup and updated script.