Revert "More cleanup"

This reverts commit 6917a3e5da4dfffb60776c39a535a70a9e63c77f.
Perform discussed modications

- Division and iteration only when `averageRuns` defined
- `runs` declared only when `averageRuns` defined