Refactored some Variables