Slight Refactor
Slight Refactor
Slight Refactor
Slight Refactor