Refactorrrrrrrrrrrr