Automate result files options.
Code cleaning.