Removed legacy items
Rewrote code
Rewrote Code
Cleaned variables