Refactor --rc option