Refactor run instance

:dancer: