refactored
refactored, yay