rework toggle beautify