General Improvements, reduction of same data stored in multiple vars -
Rhett