Refactor run usage