Refactor to mBuildSettings