Refactorrrrrr