Start factoring out configuration