Remove automatic main runner
Factor arg processing into seprate function