REFACTOR THE THINGS