Refactor variablenames