Remove some of the script hard coding