Small config/option refactory...