refactor runs parsing