arena_run code cleanup
Merge pull request #226 from gerard-leijdekkers/arena_run_code_cleanup

arena_run code cleanup