DEV: Refactor run