Refactor param values