More refactoring run rep system