Refactor run