Refactored!