Refactored: Renamed Various Variables/Classes