Brought to a single function style in main (using the Runner wrapper function), removed repetitive code

Brought to a single function style in main (using the Runner wrapper function), removed repetitive code #174