Refactor to prevent code reformatting from creating errors.