adding extra default values to config, compacting code