Minor Tweaks

Variable name changes
Deleted Unneeded Stuff