refactor yay
refactor