cleaning up parameter parsing & runner code