~ Refactor run function a bit.