Script/Object Clean up

Cleaned up the scripts and objects to have better variables to be more
descriptive