DJR:Refactor for config