Split up large Runner methods