Refactored Some Shit