REFACTOOOOOOOR!